From 67b2557da1f2cebbc900e1963fa27e9e307bec8a Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Thu, 15 May 2014 09:04:41 -0700
Subject: [PATCH] Remove silly 'm' prefix from StubObject/DeprecatedGlobal
 members

Nothing uses them outside of these two classes

Change-Id: I83a8eaff0d2d2d60592106d0e37572f898e482e9
---
 includes/DeprecatedGlobal.php | 11 +++++------
 includes/StubObject.php       | 32 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index 8a637862ee..3ba2211a4e 100644
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -26,13 +26,12 @@
  */
 
 class DeprecatedGlobal extends StubObject {
-	// The m's are to stay consistent with parent class.
-	protected $mRealValue, $mVersion;
+	protected $realValue, $version;
 
 	function __construct( $name, $realValue, $version = false ) {
 		parent::__construct( $name );
-		$this->mRealValue = $realValue;
-		$this->mVersion = $version;
+		$this->realValue = $realValue;
+		$this->version = $version;
 	}
 
 	function _newObject() {
@@ -48,7 +47,7 @@ class DeprecatedGlobal extends StubObject {
 		 * sequences for this method, but that seems to be
 		 * rather unlikely.
 		 */
-		wfDeprecated( '$' . $this->mGlobal, $this->mVersion, false, 6 );
-		return $this->mRealValue;
+		wfDeprecated( '$' . $this->global, $this->version, false, 6 );
+		return $this->realValue;
 	}
 }
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 64df81b2c3..6508bceca7 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -43,13 +43,13 @@
  */
 class StubObject {
 	/** @var null|string */
-	protected $mGlobal;
+	protected $global;
 
 	/** @var null|string */
-	protected $mClass;
+	protected $class;
 
 	/** @var array */
-	protected $mParams;
+	protected $params;
 
 	/**
 	 * Constructor.
@@ -59,9 +59,9 @@ class StubObject {
 	 * @param array $params Parameters to pass to constructor of the real object.
 	 */
 	function __construct( $global = null, $class = null, $params = array() ) {
-		$this->mGlobal = $global;
-		$this->mClass = $class;
-		$this->mParams = $params;
+		$this->global = $global;
+		$this->class = $class;
+		$this->params = $params;
 	}
 
 	/**
@@ -102,7 +102,7 @@ class StubObject {
 	 */
 	function _call( $name, $args ) {
 		$this->_unstub( $name, 5 );
-		return call_user_func_array( array( $GLOBALS[$this->mGlobal], $name ), $args );
+		return call_user_func_array( array( $GLOBALS[$this->global], $name ), $args );
 	}
 
 	/**
@@ -110,7 +110,7 @@ class StubObject {
 	 * @return object
 	 */
 	function _newObject() {
-		return MWFunction::newObj( $this->mClass, $this->mParams );
+		return MWFunction::newObj( $this->class, $this->params );
 	}
 
 	/**
@@ -139,22 +139,22 @@ class StubObject {
 	function _unstub( $name = '_unstub', $level = 2 ) {
 		static $recursionLevel = 0;
 
-		if ( !$GLOBALS[$this->mGlobal] instanceof StubObject ) {
-			return $GLOBALS[$this->mGlobal]; // already unstubbed.
+		if ( !$GLOBALS[$this->global] instanceof StubObject ) {
+			return $GLOBALS[$this->global]; // already unstubbed.
 		}
 
-		if ( get_class( $GLOBALS[$this->mGlobal] ) != $this->mClass ) {
-			$fname = __METHOD__ . '-' . $this->mGlobal;
+		if ( get_class( $GLOBALS[$this->global] ) != $this->class ) {
+			$fname = __METHOD__ . '-' . $this->global;
 			wfProfileIn( $fname );
 			$caller = wfGetCaller( $level );
 			if ( ++$recursionLevel > 2 ) {
 				wfProfileOut( $fname );
 				throw new MWException( "Unstub loop detected on call of "
-					. "\${$this->mGlobal}->$name from $caller\n" );
+					. "\${$this->global}->$name from $caller\n" );
 			}
-			wfDebug( "Unstubbing \${$this->mGlobal} on call of "
-				. "\${$this->mGlobal}::$name from $caller\n" );
-			$GLOBALS[$this->mGlobal] = $this->_newObject();
+			wfDebug( "Unstubbing \${$this->global} on call of "
+				. "\${$this->global}::$name from $caller\n" );
+			$GLOBALS[$this->global] = $this->_newObject();
 			--$recursionLevel;
 			wfProfileOut( $fname );
 		}
-- 
2.20.1